Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove RefCell from the definition and some uses of DefMap #29581

Merged
merged 4 commits into from
Nov 5, 2015

Conversation

gereeter
Copy link
Contributor

@gereeter gereeter commented Nov 4, 2015

This is basically a more conservative recreation of #24096.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors
Copy link
Contributor

bors commented Nov 4, 2015

☔ The latest upstream changes (presumably #29564) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member

r? @nrc (same reviewer on #29564)

@rust-highfive rust-highfive assigned nrc and unassigned brson Nov 4, 2015
@arielb1
Copy link
Contributor

arielb1 commented Nov 4, 2015

Q: Where is tcx::def_map borrowed mutably?
A: In astencode.

@nrc
Copy link
Member

nrc commented Nov 4, 2015

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 4, 2015

📌 Commit 7123834 has been approved by nrc

@nrc
Copy link
Member

nrc commented Nov 4, 2015

oh wait, needs a rebase

@gereeter
Copy link
Contributor Author

gereeter commented Nov 5, 2015

Rebased.

@nrc
Copy link
Member

nrc commented Nov 5, 2015

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 5, 2015

📌 Commit b1788ef has been approved by nrc

bors added a commit that referenced this pull request Nov 5, 2015
This is basically a more conservative recreation of #24096.
@bors
Copy link
Contributor

bors commented Nov 5, 2015

⌛ Testing commit b1788ef with merge 7839827...

@bors
Copy link
Contributor

bors commented Nov 5, 2015

💔 Test failed - auto-win-gnu-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

On Wed, Nov 4, 2015 at 9:51 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-gnu-32-nopt-t
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-nopt-t/builds/1979


Reply to this email directly or view it on GitHub
#29581 (comment).

@bors bors merged commit b1788ef into rust-lang:master Nov 5, 2015
@gereeter gereeter deleted the unwrap-defmap-refcell branch November 5, 2015 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants